✨ Migrate Node packages to AWS SDK v2 #5584

LiangquanLi930 · 2025-07-04T06:58:11Z

What type of PR is this?
Add one of the following kinds:
/kind feature
/kind cleanup

What this PR does / why we need it:

Migrates node package to AWS SDK V2.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #5402

Special notes for your reviewer:

Checklist:

Release note:

Migrate Node packages to AWS SDK v2

k8s-ci-robot · 2025-07-04T06:58:20Z

Welcome @LiangquanLi930!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-aws 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api-provider-aws has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

k8s-ci-robot · 2025-07-04T06:58:21Z

Hi @LiangquanLi930. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

damdo · 2025-07-04T08:05:52Z

/ok-to-test

LiangquanLi930 · 2025-07-04T08:30:49Z

@damdo Hi, I have a question I'd like to ask — regarding

cluster-api-provider-aws/pkg/cloud/interfaces.go

Lines 33 to 38 in 701052c

    
           // Session represents an AWS session. 
        
           type Session interface { 
        
           	Session() awsclient.ConfigProvider 
        
           	SessionV2() awsv2.Config 
        
           	ServiceLimiter(service string) *throttle.ServiceLimiter 
        
           }

, should it be updated to

Session() awsv2.Config

as part of this issue we’re trying to address?

damdo · 2025-07-04T09:19:05Z

Hey @LiangquanLi930 I don't think so, but better to ask @punkwalker

LiangquanLi930 · 2025-07-04T09:45:33Z

I saw #5521 — maybe we should wait for this PR to merge before proceeding with ours.

damdo · 2025-07-04T10:05:15Z

Yeah, that's probably better, let's pause this until we get the other in, thanks @LiangquanLi930

punkwalker · 2025-07-04T16:54:40Z

@LiangquanLi930 @damdo The session() can only be removed if all the dependent clients are migrated to SDK V2. Let’s wait for #5521 to merge and then cleanup every reference to SDK v1 sessions.

damdo · 2025-07-29T08:43:46Z

@LiangquanLi930 looks like there is a compilation error

damdo · 2025-07-29T10:10:20Z

Still present it looks like @LiangquanLi930

LiangquanLi930 · 2025-07-29T12:31:27Z

Still present it looks like @LiangquanLi930

I am taking it now

damdo · 2025-08-11T21:14:32Z

/test pull-cluster-api-provider-aws-test

LiangquanLi930 · 2025-08-12T04:40:55Z

/test pull-cluster-api-provider-aws-test

damdo

Thanks a lot @LiangquanLi930

@punkwalker would you be able to take a look and confirm this looks in line with what you expect to see? Thanks!

damdo · 2025-08-12T08:25:17Z

/assign @nrb

for review

damdo · 2025-08-12T08:25:45Z

/test pull-cluster-api-provider-aws-e2e-eks pull-cluster-api-provider-aws-e2e

nrb · 2025-08-12T16:07:56Z

/label tide/merge-method-squash

I'll set this to squash automatically, but in the future, try to squash changes into a single commit, especially when removing debugging commits.

pkg/cloud/services/secretsmanager/secret.go

nrb · 2025-08-12T16:13:49Z

test/e2e/shared/suite.go

@@ -158,6 +158,10 @@ func Node1BeforeSuite(e2eCtx *E2EContext) []byte {
 	e2eCtx.Environment.BootstrapAccessKey = newUserAccessKey(context.TODO(), e2eCtx.AWSSessionV2, bootstrapTemplate.Spec.BootstrapUser.UserName)
 	e2eCtx.BootstrapUserAWSSession = NewAWSSessionWithKey(e2eCtx.Environment.BootstrapAccessKey)
 	e2eCtx.BootstrapUserAWSSessionV2 = NewAWSSessionWithKeyV2(e2eCtx.Environment.BootstrapAccessKey)
+
+	By("Waiting for access key to propagate...")
+	time.Sleep(10 * time.Second)


Is there a condition that we can use an Eventually on, versus a static 10s wait?

IMHO, In this case, there isn’t an easily queryable condition to verify key propagation. The static wait ensures we avoid flakiness from IAM eventual consistency, so replacing it with Eventually wouldn’t provide a clear benefit.
And other parts of the code handle it the same way as well.

cluster-api-provider-aws/test/e2e/suites/unmanaged/unmanaged_functional_test.go

Lines 502 to 504 in c04842a

ginkgo.By("Deleting a worker node machine")

deleteMachine(ns1, md1[0])

time.Sleep(10 * time.Second)

punkwalker · 2025-08-12T16:41:58Z

pkg/cloud/scope/cluster.go

@@ -77,7 +77,7 @@ func NewClusterScope(params ClusterScopeParams) (*ClusterScope, error) {
 		maxWaitActiveUpdateDelete:    params.MaxWaitActiveUpdateDelete,
 	}

-	session, serviceLimiters, err := sessionForClusterWithRegion(params.Client, clusterScope, params.AWSCluster.Spec.Region, params.Endpoints, params.Logger)
+	serviceLimiters, err := sessionForClusterWithRegion(params.Client, clusterScope, params.AWSCluster.Spec.Region, params.Endpoints, params.Logger)


@LiangquanLi930 I see you have removed this v1 code in other scopes like ManagedNdoeGroup. Can we do the same here?

updated
https://github.com/kubernetes-sigs/cluster-api-provider-aws/compare/9c4c8f4f0ebe7848b6af0082e3fe016eb271a0ba..bf14108092476fd6d7460ba4c26a7ef59b133037

pkg/cloud/scope/managednodegroup.go

pkg/cloud/services/secretsmanager/secret.go

damdo · 2025-08-13T07:21:17Z

/test pull-cluster-api-provider-aws-e2e-eks pull-cluster-api-provider-aws-e2e

LiangquanLi930 · 2025-08-13T11:30:19Z

/retest

nrb · 2025-08-13T15:12:28Z

/approve
/lgtm

k8s-ci-robot · 2025-08-13T15:12:35Z

LGTM label has been added.

Git tree hash: b7834309a3998dc6656f03bb7c0a144100470d55

k8s-ci-robot · 2025-08-13T15:12:37Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nrb

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [nrb]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

k8s-ci-robot · 2025-08-13T15:36:49Z

@LiangquanLi930: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-cluster-api-provider-aws-apidiff-main	`bf14108`	link	false	`/test pull-cluster-api-provider-aws-apidiff-main`
pull-cluster-api-provider-aws-e2e	`bf14108`	link	false	`/test pull-cluster-api-provider-aws-e2e`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

k8s-ci-robot requested review from fiunchinho and nrb July 4, 2025 06:58

k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 4, 2025

LiangquanLi930 mentioned this pull request Jul 4, 2025

Migrate Node packages to AWS SDK v2 #5402

Closed

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 4, 2025

k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 4, 2025

LiangquanLi930 force-pushed the aws-sdk-go-v2 branch 3 times, most recently from 462b877 to 4c85641 Compare July 29, 2025 08:09

LiangquanLi930 force-pushed the aws-sdk-go-v2 branch from 4c85641 to 1e22f5e Compare July 29, 2025 09:33

k8s-ci-robot removed the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jul 29, 2025

LiangquanLi930 force-pushed the aws-sdk-go-v2 branch from cd2370f to 191a56f Compare August 11, 2025 19:33

LiangquanLi930 force-pushed the aws-sdk-go-v2 branch 4 times, most recently from 89043d1 to 9c4c8f4 Compare August 12, 2025 07:05

damdo reviewed Aug 12, 2025

View reviewed changes

damdo requested a review from nrb August 12, 2025 08:25

k8s-ci-robot assigned nrb Aug 12, 2025

k8s-ci-robot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Aug 12, 2025

nrb reviewed Aug 12, 2025

View reviewed changes

pkg/cloud/services/secretsmanager/secret.go Show resolved Hide resolved

nrb reviewed Aug 12, 2025

View reviewed changes

punkwalker suggested changes Aug 12, 2025

View reviewed changes

debug debug

bf14108

LiangquanLi930 force-pushed the aws-sdk-go-v2 branch from 9c4c8f4 to bf14108 Compare August 13, 2025 04:27

LiangquanLi930 requested a review from punkwalker August 13, 2025 14:55

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 13, 2025

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 13, 2025

k8s-ci-robot merged commit 8e80745 into kubernetes-sigs:main Aug 13, 2025
18 of 20 checks passed

k8s-ci-robot added this to the v2.8 milestone Aug 13, 2025

	ginkgo.By("Deleting a worker node machine")
	deleteMachine(ns1, md1[0])
	time.Sleep(10 * time.Second)

✨ Migrate Node packages to AWS SDK v2 #5584

✨ Migrate Node packages to AWS SDK v2 #5584

Uh oh!

Conversation

LiangquanLi930 commented Jul 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

k8s-ci-robot commented Jul 4, 2025

Uh oh!

k8s-ci-robot commented Jul 4, 2025

Uh oh!

damdo commented Jul 4, 2025

Uh oh!

LiangquanLi930 commented Jul 4, 2025

Uh oh!

damdo commented Jul 4, 2025

Uh oh!

LiangquanLi930 commented Jul 4, 2025

Uh oh!

damdo commented Jul 4, 2025

Uh oh!

punkwalker commented Jul 4, 2025

Uh oh!

damdo commented Jul 29, 2025

Uh oh!

damdo commented Jul 29, 2025

Uh oh!

LiangquanLi930 commented Jul 29, 2025

Uh oh!

damdo commented Aug 11, 2025

Uh oh!

LiangquanLi930 commented Aug 12, 2025

Uh oh!

damdo left a comment

Choose a reason for hiding this comment

Uh oh!

damdo commented Aug 12, 2025

Uh oh!

damdo commented Aug 12, 2025

Uh oh!

nrb commented Aug 12, 2025

Uh oh!

Uh oh!

nrb Aug 12, 2025

Choose a reason for hiding this comment

Uh oh!

LiangquanLi930 Aug 13, 2025

Choose a reason for hiding this comment

Uh oh!

LiangquanLi930 Aug 13, 2025

Choose a reason for hiding this comment

Uh oh!

punkwalker Aug 12, 2025

Choose a reason for hiding this comment

Uh oh!

LiangquanLi930 Aug 13, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

damdo commented Aug 13, 2025

Uh oh!

LiangquanLi930 commented Aug 13, 2025

Uh oh!

nrb commented Aug 13, 2025

Uh oh!

k8s-ci-robot commented Aug 13, 2025

Uh oh!

k8s-ci-robot commented Aug 13, 2025

Uh oh!

k8s-ci-robot commented Aug 13, 2025

Uh oh!

Uh oh!

Uh oh!

LiangquanLi930 commented Jul 4, 2025 •

edited

Loading